bitkeeper revision 1.1227 (42179b08SzTlAiKTeTL94ij1uugTCw)

Merge burn.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into burn.cl.cam.ac.uk:/local/scratch-1/maf46/xen-unstable.bk

diff --cc BitKeeper/etc/logging_ok
Simple merge

diff --cc xen/arch/x86/vmx.c
index b53708fb52c9539a23e8456594fc6b1fd16faf06,1e52eeda4451c69905b9876165f6dd5087b035a7..db5e5140dafb4237c114374348d7eea2410a3da3
--- 1/xen/arch/x86/vmx.c
--- 2/xen/arch/x86/vmx.c
+++ b/xen/arch/x86/vmx.c
@@@ -805,11 -819,9 +815,12 @@@ asmlinkage void vmx_vmexit_handler(stru
              }
              break;
          }
 +        case TRAP_nmi:
 +            do_nmi(&regs, 0);
 +            break;
          default:
-             __vmx_bug(&regs);
+             printk("unexpected VMexit for exception vector 0x%x\n", vector);
+             //__vmx_bug(&regs);
              break;
          }
          break;

diff --cc xen/drivers/char/console.c
index a26f9d7121f7c698640ba830a04119858cdb1c4a,aa487cceae89adc112d5f0b5c1938f466b681737..313d3baf505c7472eaa023923b4136304ace4501
--- 1/xen/drivers/char/console.c
--- 2/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@@ -596,9 -631,6 +631,7 @@@ void panic(const char *fmt, ...
      __putstr("Reboot in five seconds...\n");
      spin_unlock_irqrestore(&console_lock, flags);
  
-     debugtrace_dump();
- 
 +    watchdog_on = 0;
      mdelay(5000);
      machine_restart(0);
  }

diff --cc xen/include/xen/lib.h
Simple merge